bitkeeper revision 1.1159.1.68 (41207f4fvOWkrBmvJbwpyp6JQmumEg)

Fix problems with migrate help.

diff --git a/tools/python/xen/xm/main.py b/tools/python/xen/xm/main.py
index 5ba20095e5a78109cbf593958e3300a50bb30778..6bf7f83d832b8a7d999b5a6e648017df2f1e5604 100644 (file)
--- a/tools/python/xen/xm/main.py
+++ b/tools/python/xen/xm/main.py
@@ -302,10 +302,10 @@ class ProgMigrate(Prog):
     info = """Migrate a domain to another machine."""
 
     def help(self, args):
-        migrate.help(args)
+        migrate.help([self.name] + args)
     
     def main(self, args):
-        migrate.main(args)
+        migrate.main([self.name] + args)
 
 xm.prog(ProgMigrate)
 

diff --git a/tools/python/xen/xm/migrate.py b/tools/python/xen/xm/migrate.py
index 2ad18946b0eadff5a734443de315d98e97d7e9dc..3b446f0bf0e6e1935184d61517179797024a56d2 100644 (file)
--- a/tools/python/xen/xm/migrate.py
+++ b/tools/python/xen/xm/migrate.py
@@ -23,6 +23,7 @@ gopts.opt('help', short='h',
          use="Print this help.")
 
 def help(argv):
+    gopts.argv = argv
     gopts.usage()
     
 def main(argv):